removed everything. super basic now
merge