Added new constructor and moved definitions to .cpp