Created new class, moving stuff over