Framework second iteration

by Balt Pazos