Did more stuff

Added more basic frameworky stuff.